From e7a58cd8a881b8f5d62bff0127840f706503c76f Mon Sep 17 00:00:00 2001 From: "mafetter@fleming.research" Date: Sat, 12 Feb 2005 17:38:20 +0000 Subject: [PATCH] bitkeeper revision 1.1159.261.4 (420e3f0ctRGZge_a33H-GsBosW224g) Cleanup after merge --- xen/arch/x86/mm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9d6b80c718..019d9ca924 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1598,17 +1598,17 @@ int do_update_va_mapping(unsigned long va, * page was not shadowed, or that the L2 entry has not yet been * updated to reflect the shadow. */ - unsigned l2_idx = page_nr >> (L2_PAGETABLE_SHIFT - L1_PAGETABLE_SHIFT); - l2_pgentry_t gpde = linear_l2_table[l2_idx]; + l2_pgentry_t gpde = linear_l2_table[l2_table_offset(va)]; unsigned long gpfn = l2_pgentry_val(gpde) >> PAGE_SHIFT; - if (get_shadow_status(&d->mm, gpfn)) + if (get_shadow_status(d, gpfn)) { - unsigned long *gl1e = map_domain_mem(gpfn << PAGE_SHIFT); - unsigned l1_idx = page_nr & (ENTRIES_PER_L1_PAGETABLE - 1); + unsigned long gmfn = __gpfn_to_mfn(d, gpfn); + unsigned long *gl1e = map_domain_mem(gmfn << PAGE_SHIFT); + unsigned l1_idx = l1_table_offset(va); gl1e[l1_idx] = sval; unmap_domain_mem(gl1e); - put_shadow_status(&d->mm); + put_shadow_status(d); perfc_incrc(shadow_update_va_fail1); } -- 2.30.2